Changes to let BABL find its extensions at run time when the BABL_PATH

2007-09-14  Kevin Cozens  <kcozens@cvs.gnome.org>

	Changes to let BABL find its extensions at run time when the
	BABL_PATH environment variable is not set.

	* configure.ac: Don't specify BABL_PATH in here. Renamed
	BABL_LIST_SEPERATOR to BABL_DIR_SEPARATOR.

	* babl/babl-extension.c: Include /lib as part of default BABL_PATH.
	Renamed #define's used to specify the path and directory separators.
	Use the values from config.h that were set when ./configure was run.

svn path=/trunk/; revision=240

diff --git a/ChangeLog b/ChangeLog
index 52041dc2ac976595b1aa38e4c4ccefd59e15794c..41fd1716ed6f087df4292ebc6dce5a72b62f926a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-09-14  Kevin Cozens  <kcozens@cvs.gnome.org>
+
+       Changes to let BABL find its extensions at run time when the
+       BABL_PATH environment variable is not set.
+
+       * configure.ac: Don't specify BABL_PATH in here. Renamed
+       BABL_LIST_SEPERATOR to BABL_DIR_SEPARATOR.
+
+       * babl/babl-extension.c: Include /lib as part of default BABL_PATH.
+       Renamed #define's used to specify the path and directory separators.
+       Use the values from config.h that were set when ./configure was run.
+
 2007-09-11  Kevin Cozens  <kcozens@cvs.gnome.org>
 
        * autogen.sh: Added check for existence of automake-1.10.

diff --git a/babl/babl-extension.c b/babl/babl-extension.c
index c686e7de273bdc3f473fe11384ae5a07f9e7b430..1f7f203976dea3b77c99ca76408767667b97cbdd 100644 (file)
--- a/babl/babl-extension.c
+++ b/babl/babl-extension.c
@@ -21,12 +21,10 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#else
-#define BABL_PATH              PREFIX "/babl-0.0"
-#define BABL_PATH_SEPERATOR    "/"
-#define BABL_LIST_SEPERATOR    ':'
 #endif
 
+#define BABL_PATH              PREFIX "/lib/babl-0.0"
+
 #define BABL_INIT_HOOK         init_hook ();
 #define BABL_DESTROY_HOOK      destroy_hook ();
 
@@ -227,12 +225,12 @@ babl_extension_load_dir (const char *base_path)
         {
           if (dentry->d_name[0] != '.')
             {
-              char        *path = NULL;
-              struct  stat st;
-              char        *extension;
+              char       *path = NULL;
+              struct stat st;
+              char       *extension;
 
               path = babl_strcat (path, base_path);
-              path = babl_strcat (path, BABL_PATH_SEPERATOR);
+              path = babl_strcat (path, BABL_DIR_SEPARATOR);
               path = babl_strcat (path, dentry->d_name);
 
               stat (path, &st);
@@ -313,7 +311,7 @@ babl_extension_load_dir_list (const char *dir_list)
           case '\0':
             eos = 1;
 
-          case BABL_LIST_SEPERATOR:
+          case BABL_PATH_SEPARATOR:
           {
             char *expanded_path = expand_path (path);
             babl_extension_load_dir (expanded_path);

diff --git a/configure.ac b/configure.ac
index 03f9a0a2bb6e5795e2e47cdaa72eacb9e18c81b7..3d998bca42552a6a03ed512fd8d6d35259a13dcd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -178,16 +178,19 @@ AC_MSG_CHECKING([for native Win32])
 case "$target_or_host" in
   *-*-mingw*)
     os_win32=yes
-    PATHSEP=';'
+    PATH_SEP=';'
+    DIR_SEP='\'
     MATH_LIB=
     ;;
   *)
     os_win32=no
-    PATHSEP=':'
+    PATH_SEP=':'
+    DIR_SEP='/'
     ;;
 esac
 AC_MSG_RESULT([$os_win32])
-AC_SUBST(PATHSEP)
+AC_SUBST(PATH_SEP)
+AC_SUBST(DIR_SEP)
 AC_SUBST(MATH_LIB)
 
 AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
@@ -200,9 +203,10 @@ AC_SUBST(DL_LIB)
 
 AC_REPLACE_FUNCS(gettimeofday)
 
-AC_DEFINE_UNQUOTED(BABL_PATH, "~/.babl-$BABL_API_VERSION:/usr/local/lib/babl-$BABL_API_VERSION:/usr/lib/babl-$BABL_API_VERSION", [search path for babl extensions (default value of enviroment variable)])
-AC_DEFINE(BABL_PATH_SEPERATOR, "/", [string used to seperate directories in a path string]) 
-AC_DEFINE_UNQUOTED(BABL_LIST_SEPERATOR, '$PATHSEP', [seperator between paths in BABL_PATH])
+#BABL_PATH_SEPARATOR must be defined as a character.
+#BABL_DIR_SEPARATOR must be defined as a string.
+AC_DEFINE_UNQUOTED(BABL_PATH_SEPARATOR, '$PATH_SEP', [separator between paths in BABL_PATH])
+AC_DEFINE_UNQUOTED(BABL_DIR_SEPARATOR, "$DIR_SEP", [separator between directories in BABL_PATH])
 
 #####################################
 # File extension for shared libraries